bitkeeper revision 1.1301 (425efd40p7ew4Nxd9WYfNILEq8FV8A)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc linux-2.6.11-xen-sparse/drivers/xen/console/console.c
index f1f620640b54a8c06d742150587cffa1db96bfbf,a524688ec34e21f0e3ed60211dc111f788aca0b5..142ca2baaac48a41ec10a295bea1d713cca2bb0b
--- 1/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
--- 2/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
@@@ -202,24 -198,17 +213,26 @@@ void xen_console_init(void
          kcons_info.write = kcons_write;
      }
  
 -    if ( xc_mode == XC_OFF )
 -        return __RETCODE;
 -
 -    if ( xc_mode == XC_SERIAL )
 +    switch ( xc_mode )
 +    {
 +    case XC_SERIAL:
          strcpy(kcons_info.name, "ttyS");
 -    else
 +        if ( xc_num == -1 ) xc_num = 0;
 +        break;
 +
 +    case XC_TTY:
          strcpy(kcons_info.name, "tty");
 +        if ( xc_num == -1 ) xc_num = 1;
 +        break;
 +
 +    default:
 +        return __RETCODE;
 +    }
  
+     wbuf = alloc_bootmem(wbuf_size);
+ 
      register_console(&kcons_info);
 +
      return __RETCODE;
  }
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)